Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct unix socket handling to match poller-wrapper #8214

Merged
merged 1 commit into from Feb 9, 2018

Conversation

tduehr
Copy link
Contributor

@tduehr tduehr commented Feb 6, 2018

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

@CLAassistant
Copy link

CLAassistant commented Feb 6, 2018

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@murrant murrant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, must have gotten missed.

Can you make it match the code in poller-wrapper?

@@ -93,7 +93,8 @@ def get_config_data():
db_server = config['db_host']
db_port = 0
elif config['db_socket']:
db_server = config['db_socket']
db_server = config['db_host']
db_socket = config['db_socket']
db_port = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove db_port = 0

@@ -104,7 +105,7 @@ def get_config_data():
def db_open():
try:
if db_port == 0:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change this to if db_socket:

@scrutinizer-notifier
Copy link

The inspection completed: No new issues

@laf laf merged commit 2793958 into librenms:master Feb 9, 2018
@lock
Copy link

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants